projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a8c513b 86cbc9d)
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 23 Nov 2020 17:41:53 +0000 (09:41 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 23 Nov 2020 17:41:53 +0000 (09:41 -0800)
commitbe17ee78c659d0ddded4c536e10777cac2852884
tree7f4a926bb1740738364a3797824d97fad56c4408tree | snapshot
parenta8c513b6f56ec33b23de94395c949427fcb86ca1commit | diff
parent86cbc9d216c724e6be5db27fb33df2ca0c7d9804commit | diff
Merge from origin/emacs-27

86cbc9d216 Make ignoring modifiers on IME input optional
32b97bb9e0 Ignore modifiers when processing WM_IME_CHAR messages
f641ef1a07 Improve documentation of 'font-spec'

# Conflicts:
# etc/NEWS
doc/lispref/display.texi diff1 | diff2 | blob | history
etc/NEWS.27 diff1 | | blob | history
src/font.c diff1 | diff2 | blob | history
src/w32fns.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.